Update expected output for node and style tests

The previous commit changed the format of the output.

diff --git a/testsuite/css/nodes/buttons.nodes b/testsuite/css/nodes/buttons.nodes
index d1373ab7fff416ad06c620f810a6610c35227cf7..79af53720e04debadcd236c61c9f01b9216c0f62 100644 (file)
--- a/testsuite/css/nodes/buttons.nodes
+++ b/testsuite/css/nodes/buttons.nodes
@@ -1,28 +1,28 @@
-window visible=0 state=dir-ltr classes=background
-  decoration visible=1 state=dir-ltr
-  grid visible=1 state=dir-ltr classes=horizontal
-    button visible=1 state=dir-ltr|checked classes=text-button,toggle
-      label visible=1 state=dir-ltr
-    checkbutton visible=1 state=dir-ltr classes=text-button
-      check visible=1 state=dir-ltr
-      label visible=1 state=dir-ltr
-    radiobutton visible=1 state=dir-ltr|checked classes=text-button
-      radio visible=1 state=dir-ltr|checked
-      label visible=1 state=dir-ltr
-    radiobutton visible=1 state=dir-ltr classes=text-button
-      radio visible=1 state=dir-ltr
-      label visible=1 state=dir-ltr
-    switch visible=1 state=active|dir-ltr
-      slider visible=1 classes=slider
-    switch visible=1 state=dir-ltr
-      slider visible=1 classes=slider
-    button visible=1 state=dir-ltr classes=text-button
-      label visible=1 state=dir-ltr
-    button visible=1 state=dir-ltr classes=image-button
-      GtkAlignment visible=1 state=dir-ltr
-        box visible=1 state=dir-ltr classes=horizontal
-          image visible=1 state=dir-ltr
-    button visible=1 state=dir-ltr classes=image-button
-      GtkAlignment visible=1 state=dir-ltr
-        box visible=1 state=dir-ltr classes=horizontal
-          image visible=1 state=dir-ltr
+[window.background:dir(ltr)]
+  decoration:dir(ltr)
+  grid.horizontal:dir(ltr)
+    button.text-button.toggle:dir(ltr):checked
+      label:dir(ltr)
+    checkbutton.text-button:dir(ltr)
+      check:dir(ltr)
+      label:dir(ltr)
+    radiobutton.text-button:dir(ltr):checked
+      radio:dir(ltr):checked
+      label:dir(ltr)
+    radiobutton.text-button:dir(ltr)
+      radio:dir(ltr)
+      label:dir(ltr)
+    switch:active:dir(ltr)
+      slider.slider
+    switch:dir(ltr)
+      slider.slider
+    button.text-button:dir(ltr)
+      label:dir(ltr)
+    button.image-button:dir(ltr)
+      GtkAlignment:dir(ltr)
+        box.horizontal:dir(ltr)
+          image:dir(ltr)
+    button.image-button:dir(ltr)
+      GtkAlignment:dir(ltr)
+        box.horizontal:dir(ltr)
+          image:dir(ltr)

diff --git a/testsuite/css/nodes/entries.nodes b/testsuite/css/nodes/entries.nodes
index a2b6f5f9189aa98a5f3bcbbdc5502a1c8017dce1..fb3b2782a1fd1428f9aaf3f9ca021ad99d106f86 100644 (file)
--- a/testsuite/css/nodes/entries.nodes
+++ b/testsuite/css/nodes/entries.nodes
@@ -1,16 +1,16 @@
-window visible=0 state=dir-ltr classes=background
-  decoration visible=1 state=dir-ltr
-  box visible=0 state=dir-ltr classes=horizontal
-    label visible=1 state=dir-ltr
-    label visible=1 state=dir-ltr
-    label visible=1 state=dir-ltr
-    entry visible=1 state=dir-ltr
-      progress visible=1 state=dir-ltr
-    entry visible=1 state=dir-ltr
-    entry visible=1 state=dir-ltr
-      image visible=1 state=dir-ltr classes=left
-      image visible=1 state=dir-ltr classes=right
-    spinbutton visible=1 state=dir-ltr classes=horizontal
-      entry visible=1 state=dir-ltr
-      button visible=1 state=dir-ltr classes=down
-      button visible=1 state=dir-ltr classes=up
+[window.background:dir(ltr)]
+  decoration:dir(ltr)
+  [box.horizontal:dir(ltr)]
+    label:dir(ltr)
+    label:dir(ltr)
+    label:dir(ltr)
+    entry:dir(ltr)
+      progress:dir(ltr)
+    entry:dir(ltr)
+    entry:dir(ltr)
+      image.left:dir(ltr)
+      image.right:dir(ltr)
+    spinbutton.horizontal:dir(ltr)
+      entry:dir(ltr)
+      button.down:dir(ltr)
+      button.up:dir(ltr)

diff --git a/testsuite/css/nodes/levelbar.nodes b/testsuite/css/nodes/levelbar.nodes
index 56770221dca6b3a296370a8a7da4fe26ffb52a03..56716b197dfa4af3ab704f44c5f8745c14c67160 100644 (file)
--- a/testsuite/css/nodes/levelbar.nodes
+++ b/testsuite/css/nodes/levelbar.nodes
@@ -1,55 +1,55 @@
-window visible=0 state=dir-ltr classes=background
-  decoration visible=1 state=dir-ltr
-  box visible=1 state=dir-ltr classes=vertical
-    levelbar visible=1 state=dir-ltr classes=horizontal,continuous
-      trough visible=1 state=dir-ltr
-        block visible=1 state=dir-ltr classes=high,filled
-        block visible=1 state=dir-ltr classes=empty
-    levelbar visible=1 state=dir-ltr classes=horizontal,continuous
-      trough visible=1 state=dir-ltr
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=high,filled
-    levelbar visible=1 state=dir-ltr classes=horizontal,continuous
-      trough visible=1 state=dir-ltr
-        block visible=1 state=dir-ltr classes=low,filled
-        block visible=1 state=dir-ltr classes=empty
-    levelbar visible=1 state=dir-ltr classes=horizontal,continuous
-      trough visible=1 state=dir-ltr
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=empty
-    levelbar visible=1 state=dir-ltr classes=horizontal,discrete
-      trough visible=1 state=dir-ltr
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-    levelbar visible=1 state=dir-ltr classes=horizontal,discrete
-      trough visible=1 state=dir-ltr
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
-    levelbar visible=1 state=dir-ltr classes=horizontal,discrete
-      trough visible=1 state=dir-ltr
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=full,filled
-        block visible=1 state=dir-ltr classes=empty
-        block visible=1 state=dir-ltr classes=empty
+[window.background:dir(ltr)]
+  decoration:dir(ltr)
+  box.vertical:dir(ltr)
+    levelbar.horizontal.continuous:dir(ltr)
+      trough:dir(ltr)
+        block.high.filled:dir(ltr)
+        block.empty:dir(ltr)
+    levelbar.horizontal.continuous:dir(ltr)
+      trough:dir(ltr)
+        block.empty:dir(ltr)
+        block.high.filled:dir(ltr)
+    levelbar.horizontal.continuous:dir(ltr)
+      trough:dir(ltr)
+        block.low.filled:dir(ltr)
+        block.empty:dir(ltr)
+    levelbar.horizontal.continuous:dir(ltr)
+      trough:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.empty:dir(ltr)
+    levelbar.horizontal.discrete:dir(ltr)
+      trough:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+    levelbar.horizontal.discrete:dir(ltr)
+      trough:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)
+    levelbar.horizontal.discrete:dir(ltr)
+      trough:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.full.filled:dir(ltr)
+        block.empty:dir(ltr)
+        block.empty:dir(ltr)

diff --git a/testsuite/css/nodes/notebook.nodes b/testsuite/css/nodes/notebook.nodes
index 0264855ed6ca9d4ff27424761ff647103a03a780..947cc7213b1fd8787fc982b572d0e89700a0e6c9 100644 (file)
--- a/testsuite/css/nodes/notebook.nodes
+++ b/testsuite/css/nodes/notebook.nodes
@@ -1,15 +1,15 @@
-window visible=0 state=dir-ltr classes=background
-  decoration visible=1 state=dir-ltr
-  notebook visible=1 state=dir-ltr classes=frame
-    header visible=1 state=dir-ltr classes=top
-      button visible=1 state=dir-ltr classes=text-button
-        label visible=1 state=dir-ltr
-      tabs visible=1 state=dir-ltr
-        tab visible=1 state=active|dir-ltr
-          label visible=1 state=dir-ltr
-        tab visible=1 state=dir-ltr
-          label visible=1 state=dir-ltr
-    button visible=1 state=dir-ltr classes=text-button
-      label visible=1 state=dir-ltr
-    button visible=1 state=dir-ltr classes=text-button
-      label visible=1 state=dir-ltr
+[window.background:dir(ltr)]
+  decoration:dir(ltr)
+  notebook.frame:dir(ltr)
+    header.top:dir(ltr)
+      button.text-button:dir(ltr)
+        label:dir(ltr)
+      tabs:dir(ltr)
+        tab:active:dir(ltr)
+          label:dir(ltr)
+        tab:dir(ltr)
+          label:dir(ltr)
+    button.text-button:dir(ltr)
+      label:dir(ltr)
+    button.text-button:dir(ltr)
+      label:dir(ltr)

diff --git a/testsuite/css/nodes/progressbar.nodes b/testsuite/css/nodes/progressbar.nodes
index 3cd63310af0667f0f9e131fc9298809d7bb44943..5b85ad1d4e3b7ddd7753e260a56b378f65ed0523 100644 (file)
--- a/testsuite/css/nodes/progressbar.nodes
+++ b/testsuite/css/nodes/progressbar.nodes
@@ -1,20 +1,20 @@
-window visible=0 state=dir-ltr classes=background
-  decoration visible=1 state=dir-ltr
-  box id=progressbars visible=1 state=dir-ltr classes=vertical
-    progressbar visible=1 state=dir-ltr classes=horizontal
-      text visible=1 state=dir-ltr
-      trough visible=1 state=dir-ltr
-        progress visible=1 state=dir-ltr classes=left
-    progressbar visible=1 state=dir-ltr classes=horizontal
-      trough visible=1 state=dir-ltr
-        progress visible=1 state=dir-ltr classes=left
-    progressbar visible=1 state=dir-ltr classes=horizontal
-      text visible=1 state=dir-ltr
-      trough visible=1 state=dir-ltr
-        progress visible=1 state=dir-ltr classes=left
-    progressbar visible=1 state=dir-ltr classes=horizontal
-      trough visible=1 state=dir-ltr
-        progress visible=1 state=dir-ltr classes=right
-    progressbar visible=1 state=dir-ltr classes=vertical
-      trough visible=1 state=dir-ltr
-        progress visible=1 state=dir-ltr classes=top
+[window.background:dir(ltr)]
+  decoration:dir(ltr)
+  box#progressbars.vertical:dir(ltr)
+    progressbar.horizontal:dir(ltr)
+      text:dir(ltr)
+      trough:dir(ltr)
+        progress.left:dir(ltr)
+    progressbar.horizontal:dir(ltr)
+      trough:dir(ltr)
+        progress.left:dir(ltr)
+    progressbar.horizontal:dir(ltr)
+      text:dir(ltr)
+      trough:dir(ltr)
+        progress.left:dir(ltr)
+    progressbar.horizontal:dir(ltr)
+      trough:dir(ltr)
+        progress.right:dir(ltr)
+    progressbar.vertical:dir(ltr)
+      trough:dir(ltr)
+        progress.top:dir(ltr)

diff --git a/testsuite/css/style/currentcolor.nodes b/testsuite/css/style/currentcolor.nodes
index 36737782cf31de4a24fa21ec371aacb3e9a502ea..9724b148f592ac0f185786db69e507653f273b99 100644 (file)
--- a/testsuite/css/style/currentcolor.nodes
+++ b/testsuite/css/style/currentcolor.nodes
@@ -1,7 +1,7 @@
-window visible=0 state=dir-ltr classes=background
-  decoration visible=1 state=dir-ltr
-  box visible=1 state=dir-ltr classes=horizontal
+[window.background:dir(ltr)]
+  decoration:dir(ltr)
+  box.horizontal:dir(ltr)
     color: rgb(255,0,0) (currentcolor.css:4:12)
-    label visible=1 state=dir-ltr
+    label:dir(ltr)
       color: rgb(255,0,0) (reset-to-defaults.css:2:12)
       background-color: rgb(255,0,0) (currentcolor.css:8:32)

diff --git a/testsuite/css/style/inherit.nodes b/testsuite/css/style/inherit.nodes
index b27d707cb4cd49f9be9499b7a86820caf8d6ff00..e69f8248a1862af310fa5c8b79c8293c791fdd05 100644 (file)
--- a/testsuite/css/style/inherit.nodes
+++ b/testsuite/css/style/inherit.nodes
@@ -1,9 +1,9 @@
-window visible=0 state=dir-ltr classes=background
-  decoration visible=1 state=dir-ltr
-  box visible=1 state=dir-ltr classes=horizontal
+[window.background:dir(ltr)]
+  decoration:dir(ltr)
+  box.horizontal:dir(ltr)
     color: rgb(255,0,0) (inherit.css:4:12)
     opacity: 0.5 (inherit.css:5:14)
-    label id=label1 visible=1 state=dir-ltr
+    label#label1:dir(ltr)
       opacity: 0.5 (inherit.css:10:18)
-    label id=label2 visible=1 state=dir-ltr
+    label#label2:dir(ltr)
       color: rgb(255,0,0) (reset-to-defaults.css:2:12)

diff --git a/testsuite/css/style/label.nodes b/testsuite/css/style/label.nodes
index 938e9297b6c83f2f0a2da9e0097354caae0abc8a..e967924afcb1b268b1b5897f093c933780f5d8b6 100644 (file)
--- a/testsuite/css/style/label.nodes
+++ b/testsuite/css/style/label.nodes
@@ -1,6 +1,6 @@
-window visible=0 state=dir-ltr classes=background
-  decoration visible=1 state=dir-ltr
-  box visible=1 state=dir-ltr classes=horizontal
+[window.background:dir(ltr)]
+  decoration:dir(ltr)
+  box.horizontal:dir(ltr)
     font-family: "\"Comic Sans\"" (label.css:4:20)
-    label visible=1 state=dir-ltr
+    label:dir(ltr)
       font-family: "\"Comic Sans\"" (reset-to-defaults.css:2:12)

diff --git a/testsuite/css/style/nth-child.nodes b/testsuite/css/style/nth-child.nodes
index 55c70d84423f9b01ce937268c6665789b96f5b54..32baabffe9d878f7fcff25c1935a19663d4ff4c9 100644 (file)
--- a/testsuite/css/style/nth-child.nodes
+++ b/testsuite/css/style/nth-child.nodes
@@ -1,13 +1,13 @@
-window visible=0 state=dir-ltr classes=background
-  decoration visible=1 state=dir-ltr
-  box visible=1 state=dir-ltr classes=horizontal
-    box visible=1 state=dir-ltr classes=horizontal
-      label visible=1 state=dir-ltr
+[window.background:dir(ltr)]
+  decoration:dir(ltr)
+  box.horizontal:dir(ltr)
+    box.horizontal:dir(ltr)
+      label:dir(ltr)
         font-size: 20px (nth-child.css:4:17)
-      label visible=1 state=dir-ltr
+      label:dir(ltr)
         font-size: 30px (nth-child.css:7:17)
-      label visible=1 state=dir-ltr
+      label:dir(ltr)
         font-size: 40px (nth-child.css:10:17)
-    box visible=1 state=dir-ltr classes=horizontal
-      label visible=1 state=dir-ltr
+    box.horizontal:dir(ltr)
+      label:dir(ltr)
         font-size: 50px (nth-child.css:13:17)